Skip to content

Fix topic inheritance for translated documents #6633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 25, 2025
Merged

Fix topic inheritance for translated documents #6633

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4fb3cb1
Fix topic inheritance for translated documents
smithellis Apr 21, 2025
495dccc
just fix display vs handle updates
smithellis Apr 21, 2025
85a2ea3
add parent check in additional part of query
smithellis Apr 22, 2025
6ec1c78
add tests
smithellis Apr 22, 2025
476be87
fix caching in tests
smithellis Apr 23, 2025
8a13565
improve tests
smithellis Apr 23, 2025
8b05785
fix overly aggressive test change
smithellis Apr 23, 2025
8409e1f
Clean up the casting to sets
smithellis Apr 23, 2025
060c8f1
turn sets back to lists
smithellis Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion kitsune/wiki/facets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ def _documents_for(user, locale, topics=None, products=None):
if topics:
topic_ids = [t.id for t in topics]
# we need to filter against parent topics for localized articles
qs = qs.filter(Q(topics__in=topic_ids) | Q(parent__topics__in=topic_ids))
qs = qs.filter(
Q(topics__in=topic_ids) | Q(parent__isnull=False, parent__topics__in=topic_ids)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should also add the parent check to the first Q clause:

Q(parent__isnull=True, topics__in=topic_ids) | ...

)
for product in products or []:
# we need to filter against parent products for localized articles
qs = qs.filter(Q(products=product) | Q(parent__products=product))
Expand Down